From 5795c83cb36394d6cec773f8881375e9b398386b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Dec 2003 00:12:46 +0000 Subject: [PATCH] Fix the position of the popup window when in RTL mode. (#127578) Sat Dec 6 01:13:09 2003 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the popup window when in RTL mode. (#127578) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcombo.c | 2 ++ 6 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index a886f8f11d..b7dfc3da7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 6 01:13:09 2003 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the + popup window when in RTL mode. (#127578) + Fri Dec 5 15:30:16 2003 Manish Singh * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a886f8f11d..b7dfc3da7e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Dec 6 01:13:09 2003 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the + popup window when in RTL mode. (#127578) + Fri Dec 5 15:30:16 2003 Manish Singh * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a886f8f11d..b7dfc3da7e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Dec 6 01:13:09 2003 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the + popup window when in RTL mode. (#127578) + Fri Dec 5 15:30:16 2003 Manish Singh * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a886f8f11d..b7dfc3da7e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Dec 6 01:13:09 2003 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the + popup window when in RTL mode. (#127578) + Fri Dec 5 15:30:16 2003 Manish Singh * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a886f8f11d..b7dfc3da7e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Dec 6 01:13:09 2003 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_get_pos): Fix the position of the + popup window when in RTL mode. (#127578) + Fri Dec 5 15:30:16 2003 Manish Singh * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 4c17f32fce..52744fb539 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -444,6 +444,8 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w scrollbar_spacing = _gtk_scrolled_window_get_scrollbar_spacing (popup); gdk_window_get_origin (combo->entry->window, x, y); + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + *x -= widget->allocation.width - combo->entry->allocation.width; real_height = MIN (combo->entry->requisition.height, combo->entry->allocation.height); *y += real_height; -- 2.30.2